From: Florian Müllner <fmuellner@gnome.org>
Date: Wed, 13 Apr 2022 18:14:47 +0000 (+0200)
Subject: background: Pass cancellable when querying file info
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~480^2^2~37
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=dd28832dcdb7ef390cc444ec046cfafce56ebc81;p=gnome-shell.git

background: Pass cancellable when querying file info

Otherwise it is possible that the operation completes successfully
after the background has been destroyed, which will throw a warning
(caused by accessing the this._fileWatches object after it has been
nulled).

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/5337

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2268>
---

diff --git a/js/ui/background.js b/js/ui/background.js
index 198194a50..825fee0d9 100644
--- a/js/ui/background.js
+++ b/js/ui/background.js
@@ -492,7 +492,7 @@ var Background = GObject.registerClass({
                 Gio.FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE,
                 Gio.FileQueryInfoFlags.NONE,
                 0,
-                null);
+                this._cancellable);
         } catch (e) {
             this._setLoaded();
             return;